bitkeeper revision 1.1159.217.5 (41e3fd80-YwWnx2lwk_nYltmgmi0QA)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

diff --cc .hgtags
index d9f4b045b17bbd958cc8862622a164831983f3d9,22f47de4472f3ad3160637104cd2d329a0871b5e..c60163a5cdd9f4287af9989050f9c6c8a56ca08f
--- 1/.hgtags
--- 2/.hgtags
+++ b/.hgtags
@@@ -1,7 -1,6 +1,7 @@@
  42882b3e0dda89f3a8ec00da568f86e9b3c230f1 RELEASE-2.0.0
  475a162b66e2c19b1e9468b234a4ba705334905e RELEASE-2.0.1
- 47043486577855efe8838fa23d8a18cd793ebff2 RELEASE-2.0.3
 +dc2f08429f17e6614fd2f1ab88cc09ca0a850f32 RELEASE-2.0.2
+ 82ba8bd1ceb2e03af769775fb8bc890dcab04f72 RELEASE-2.0.3
  487b2ee37d1cecb5f3e7a546b05ad097a0226f2f beta1
  3d330e41f41ce1bc118c02346e18949ad5d67f6b latest-semistable
  30c521db4c71960b0cf1d9c9e1b658e77b535a3e latest-stable

diff --cc xen/arch/x86/x86_32/seg_fixup.c
index 7036052e9ab3f2785eb694f8e4b6955249e4043f,7c53def147f32a6d80638ed010be18800588e01c..670459708244e48ef6b7eafbc16745438dd6fc8f
--- 1/xen/arch/x86/x86_32/seg_fixup.c
--- 2/xen/arch/x86/x86_32/seg_fixup.c
+++ b/xen/arch/x86/x86_32/seg_fixup.c
@@@ -179,10 -179,10 +179,10 @@@ int fixup_seg(u16 seg, unsigned long of
      /* Get base and check limit. */
      if ( ldt )
      {
 -        table = (unsigned long *)LDT_VIRT_START;
 +        table = (unsigned long *)LDT_VIRT_START(d);
          if ( idx >= d->mm.ldt_ents )
          {
-             DPRINTK("Segment %04x out of LDT range (%d)\n",
+             DPRINTK("Segment %04x out of LDT range (%ld)\n",
                      seg, d->mm.ldt_ents);
              goto fail;
          }